diff --git a/samplecode/SampleFatBits.cpp b/samplecode/SampleFatBits.cpp
index 44d7abe..7ac87a7 100644
--- a/samplecode/SampleFatBits.cpp
+++ b/samplecode/SampleFatBits.cpp
@@ -120,7 +120,6 @@
                 break;
             case kStroke_Style:
                 paint->setStrokeWidth(SK_Scalar1);
-//                paint->setStrokeWidth(SK_Scalar1 + SK_Scalar1/500);
                 break;
         }
         paint->setAntiAlias(aa);
@@ -421,7 +420,8 @@
         }
     }
 
-    virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y) {
+    virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y,
+                                              unsigned modi) SK_OVERRIDE {
         SkPoint pt = { x, y };
         int index = -1;
         SkScalar tol = 12;
@@ -433,7 +433,7 @@
         return new IndexClick(this, index);
     }
 
-    virtual bool onClick(Click* click) {
+    virtual bool onClick(Click* click) SK_OVERRIDE {
         int index = IndexClick::GetIndex(click);
         if (index >= 0 && index <= 1) {
             fPts[index] = click->fCurr;
