diff --git a/AppKit/CPMenu/_CPMenuBarWindow.j b/AppKit/CPMenu/_CPMenuBarWindow.j
index 4eac7d17a..d8406f3e9 100644
--- a/AppKit/CPMenu/_CPMenuBarWindow.j
+++ b/AppKit/CPMenu/_CPMenuBarWindow.j
@@ -257,7 +257,7 @@ var _CPMenuBarWindowBackgroundColor = nil,
         items = [_menu itemArray],
         count = items.length;
 
-    for (index = 0; index < count; ++index)
+    for (var index = 0; index < count; ++index)
     {
         var item = items[index],
             menuItemView = [item _menuItemView];
diff --git a/AppKit/CPScroller.j b/AppKit/CPScroller.j
index 55c884139..a466dbbea 100644
--- a/AppKit/CPScroller.j
+++ b/AppKit/CPScroller.j
@@ -521,7 +521,8 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
     [self checkSpaceForParts];
 
     var index = 0,
-        count = PARTS_ARRANGEMENT.length;
+        count = PARTS_ARRANGEMENT.length,
+        view;
 
     for (; index < count; ++index)
     {
diff --git a/AppKit/CPTableView.j b/AppKit/CPTableView.j
index cb28fb249..c2c4f1ae9 100644
--- a/AppKit/CPTableView.j
+++ b/AppKit/CPTableView.j
@@ -1791,7 +1791,7 @@ NOT YET IMPLEMENTED
 {
     if (_implementedDelegateMethods & CPTableViewDelegate_tableView_heightOfRow_)
     {
-            return idx = [_cachedRowHeights indexOfObject:aPoint
+            return [_cachedRowHeights indexOfObject:aPoint
                                             inSortedRange:nil
                                                   options:0
                                           usingComparator:function(aPoint, rowCache)
diff --git a/AppKit/CPWindow/_CPHUDWindowView.j b/AppKit/CPWindow/_CPHUDWindowView.j
index d84ad6e60..1f3a391bf 100644
--- a/AppKit/CPWindow/_CPHUDWindowView.j
+++ b/AppKit/CPWindow/_CPHUDWindowView.j
@@ -90,7 +90,7 @@ var HUD_TITLEBAR_HEIGHT             = 26.0;
 
     if ([[[self window] toolbar] isVisible])
     {
-        toolbarHeight = CGRectGetHeight([[self toolbarView] frame]);
+        var toolbarHeight = CGRectGetHeight([[self toolbarView] frame]);
 
         contentRect.origin.y += toolbarHeight;
         contentRect.size.height -= toolbarHeight;
diff --git a/AppKit/CPWindow/_CPStandardWindowView.j b/AppKit/CPWindow/_CPStandardWindowView.j
index abd7e389d..03c44a6c0 100644
--- a/AppKit/CPWindow/_CPStandardWindowView.j
+++ b/AppKit/CPWindow/_CPStandardWindowView.j
@@ -181,7 +181,7 @@ var STANDARD_GRADIENT_HEIGHT                    = 41.0,
 
     if ([theToolbar isVisible])
     {
-        toolbarHeight = CGRectGetHeight([[theToolbar _toolbarView] frame]);
+        var toolbarHeight = CGRectGetHeight([[theToolbar _toolbarView] frame]);
 
         contentRect.origin.y += toolbarHeight;
         contentRect.size.height -= toolbarHeight;