diff --git a/Source/NSCollectionView.m b/Source/NSCollectionView.m
index dbad9aeb2..49f407888 100644
--- a/Source/NSCollectionView.m
+++ b/Source/NSCollectionView.m
@@ -69,7 +69,7 @@ APPKIT_DECLARE NSCollectionViewSupplementaryElementKind GSNoSupplementaryElement
  * Private helper macro to check, if the method given via the selector sel 
  * has been overridden in the current subclass.
  */
-#define OVERRIDDEN(sel) ([_collectionViewLayout methodForSelector: @selector(sel)] != [[_collectionViewLayout class] instanceMethodForSelector: @selector(sel)])
+#define OVERRIDDEN(sel) ([_collectionViewLayout methodForSelector: @selector(sel)] != [[NSCollectionViewLayout class] instanceMethodForSelector: @selector(sel)])
 
 /*
  * Class variables
diff --git a/Source/NSCollectionViewGridLayout.m b/Source/NSCollectionViewGridLayout.m
index fb7327ef2..c1728fd4c 100644
--- a/Source/NSCollectionViewGridLayout.m
+++ b/Source/NSCollectionViewGridLayout.m
@@ -263,4 +263,9 @@
   return attrs;
 }
 
+- (NSSize) collectionViewContentSize
+{
+  return [_collectionView frame].size;
+}
+
 @end