diff --git a/framework/fling-curve.dart b/framework/fling-curve.dart
index 6dce624dda84ad6d0643ace5290e864df0b03a1b..6a476d7085eb2c0a06d505a232b9615e6390aff5 100644
--- a/framework/fling-curve.dart
+++ b/framework/fling-curve.dart
@@ -9,15 +9,19 @@ const double _kDefaultBeta = 172.0;
 const double _kDefaultGamma = 3.7;
 
 double _positionAtTime(double t) {
-  return kDefaultAlpha * math.exp(-kDefaultGamma * t) - kDefaultBeta * t - kDefaultAlpha;
+  return _kDefaultAlpha * math.exp(-_kDefaultGamma * t)
+      - _kDefaultBeta * t
+      - _kDefaultAlpha;
 }
 
 double _velocityAtTime(double t) {
-  return -kDefaultAlpha * kDefaultGamma * math.exp(-kDefaultGamma * t) - kDefaultBeta;
+  return -_kDefaultAlpha * _kDefaultGamma * math.exp(-_kDefaultGamma * t)
+      - _kDefaultBeta;
 }
 
 double _timeAtVelocity(double v) {
-  return -math.log((v + kDefaultBeta) / (-kDefaultAlpha * kDefaultGamma)) / kDefaultGamma;
+  return -math.log((v + _kDefaultBeta) / (-_kDefaultAlpha * _kDefaultGamma))
+      / _kDefaultGamma;
 }
 
 final double _kMaxVelocity = _velocityAtTime(0.0);
diff --git a/framework/sky-drawer.sky b/framework/sky-drawer.sky
index c4fc9aba83c44175dbe7474cb21263f37cdc2399..9a54caa694a9af45ad2cd302426e7ebe975bfb34 100644
--- a/framework/sky-drawer.sky
+++ b/framework/sky-drawer.sky
@@ -64,7 +64,7 @@ class SkyDrawer extends SkyElement implements AnimationDelegate {
 
   void shadowRootReady() {
     _mask = shadowRoot.getElementById('mask');
-    _mask.addEventListener('click', _handleMaskClick);
+    _mask.addEventListener('gesturetap', _handleMaskTap);
     _content = shadowRoot.getElementById('content');
     _content.addEventListener('gestureflingstart', _handleFlingStart);
     position = -_kWidth;
@@ -119,7 +119,7 @@ class SkyDrawer extends SkyElement implements AnimationDelegate {
     position = p;
   }
 
-  void _handleMaskClick(_) {
+  void _handleMaskTap(_) {
     close();
   }
 
diff --git a/framework/sky-scrollable.sky b/framework/sky-scrollable.sky
index e0292d1d1ca621ca965debd77fd7f49ef17e4004..fa287a064cc32a15b06cdfe4d4ff42880bf88030 100644
--- a/framework/sky-scrollable.sky
+++ b/framework/sky-scrollable.sky
@@ -13,7 +13,7 @@
     position: relative;
   }
   #scrollable {
-    transform: translateY(0);
+    will-change: transform;
   }
   #vbar {
     position: absolute;