diff --git a/Classes/Views/GLFileView.m b/Classes/Views/GLFileView.m
index 62101b1a2..1e626086e 100644
--- a/Classes/Views/GLFileView.m
+++ b/Classes/Views/GLFileView.m
@@ -110,25 +110,25 @@ - (void) selectCommit:(NSString*)c
 
 #pragma mark MGScopeBarDelegate methods
 
-- (int)numberOfGroupsInScopeBar:(MGScopeBar *)theScopeBar
+- (NSInteger)numberOfGroupsInScopeBar:(MGScopeBar *)theScopeBar
 {
 	return [self.groups count];
 }
 
 
-- (NSArray *)scopeBar:(MGScopeBar *)theScopeBar itemIdentifiersForGroup:(int)groupNumber
+- (NSArray *)scopeBar:(MGScopeBar *)theScopeBar itemIdentifiersForGroup:(NSInteger)groupNumber
 {
 	return [[self.groups objectAtIndex:groupNumber] valueForKeyPath:[NSString stringWithFormat:@"%@.%@", GROUP_ITEMS, ITEM_IDENTIFIER]];
 }
 
 
-- (NSString *)scopeBar:(MGScopeBar *)theScopeBar labelForGroup:(int)groupNumber
+- (NSString *)scopeBar:(MGScopeBar *)theScopeBar labelForGroup:(NSInteger)groupNumber
 {
 	return [[self.groups objectAtIndex:groupNumber] objectForKey:GROUP_LABEL]; // might be nil, which is fine (nil means no label).
 }
 
 
-- (NSString *)scopeBar:(MGScopeBar *)theScopeBar titleOfItem:(NSString *)identifier inGroup:(int)groupNumber
+- (NSString *)scopeBar:(MGScopeBar *)theScopeBar titleOfItem:(NSString *)identifier inGroup:(NSInteger)groupNumber
 {
 	NSArray *items = [[self.groups objectAtIndex:groupNumber] objectForKey:GROUP_ITEMS];
 	if (items) {
@@ -143,12 +143,12 @@ - (NSString *)scopeBar:(MGScopeBar *)theScopeBar titleOfItem:(NSString *)identif
 }
 
 
-- (MGScopeBarGroupSelectionMode)scopeBar:(MGScopeBar *)theScopeBar selectionModeForGroup:(int)groupNumber
+- (MGScopeBarGroupSelectionMode)scopeBar:(MGScopeBar *)theScopeBar selectionModeForGroup:(NSInteger)groupNumber
 {
 	return [[[self.groups objectAtIndex:groupNumber] objectForKey:GROUP_SELECTION_MODE] intValue];
 }
 
-- (void)scopeBar:(MGScopeBar *)theScopeBar selectedStateChanged:(BOOL)selected forItem:(NSString *)identifier inGroup:(int)groupNumber
+- (void)scopeBar:(MGScopeBar *)theScopeBar selectedStateChanged:(BOOL)selected forItem:(NSString *)identifier inGroup:(NSInteger)groupNumber
 {
 	startFile=identifier;
 	NSString *path = [NSString stringWithFormat:@"html/views/%@", identifier];
diff --git a/MGScopeBar b/MGScopeBar
index 3d17710f5..101e697e2 160000
--- a/MGScopeBar
+++ b/MGScopeBar
@@ -1 +1 @@
-Subproject commit 3d17710f516aae83e918cdadbe16a40d1dcd7f22
+Subproject commit 101e697e285eb09795e417d43312adfa396ef76e