diff --git a/lib/jquery.uls/src/jquery.uls.core.js b/lib/jquery.uls/src/jquery.uls.core.js
index 7286a743..0d3cfd0d 100644
--- a/lib/jquery.uls/src/jquery.uls.core.js
+++ b/lib/jquery.uls/src/jquery.uls.core.js
@@ -432,15 +432,15 @@
 			var scrollPosition,
 				$window = $( window ),
 				windowHeight = $window.height(),
-				windowScrollTop = $window.scrollTop(),
-				windowBottom = windowScrollTop + windowHeight,
+				windowTop = $window.scrollTop(),
+				windowBottom = windowTop + windowHeight,
 				$element = $( this ),
 				panelHeight = $element.height(),
 				panelTop = $element.offset().top,
 				panelBottom = panelTop + panelHeight;
 
-			if ( ( panelTop < windowScrollTop ) || ( panelBottom > windowBottom ) ) {
-				if ( panelHeight > windowHeight ) {
+			if ( ( panelTop < windowTop ) || ( panelBottom > windowBottom ) ) {
+				if ( windowTop > panelTop ) {
 					scrollPosition = panelTop;
 				} else {
 					scrollPosition = panelBottom - windowHeight;
diff --git a/lib/jquery.uls/src/jquery.uls.lcd.js b/lib/jquery.uls/src/jquery.uls.lcd.js
index 9ed60b36..927f419b 100644
--- a/lib/jquery.uls/src/jquery.uls.lcd.js
+++ b/lib/jquery.uls/src/jquery.uls.lcd.js
@@ -178,7 +178,8 @@
 			$.each( $.uls.data.regiongroups, function ( regionCode ) {
 				$section = $( '<div>' ).addClass( 'twelve columns uls-lcd-region-section' ).prop( 'id', regionCode );
 
-				$sectionTitle = $( '<h3 data-i18n="uls-region-' + regionCode + '">' )
+				$sectionTitle = $( '<h3>' )
+					.attr( 'data-i18n', 'uls-region-' + regionCode )
 					.addClass( 'eleven columns uls-lcd-region-section uls-lcd-region-title offset-by-one' )
 					.text( regions[regionCode] );
 
@@ -214,7 +215,8 @@
 			quickList.sort( $.uls.data.sortByAutonym );
 
 			$quickListSection = $( '<div>' ).addClass( 'twelve columns uls-lcd-region-section' ).prop( 'id', 'uls-lcd-quicklist' );
-			$quickListSectionTitle = $( '<h3 data-i18n="uls-common-languages">' )
+			$quickListSectionTitle = $( '<h3>' )
+				.attr( 'data-i18n', 'uls-common-languages' )
 				.addClass( 'eleven columns uls-lcd-region-section uls-lcd-region-title offset-by-one' )
 				.text( 'Common languages' ); // This is placeholder text if jquery.i18n not present
 			$quickListSection.append( $quickListSectionTitle );