diff --git a/js/script.js b/js/script.js
index 060518a73..8c8f4521d 100644
--- a/js/script.js
+++ b/js/script.js
@@ -195,7 +195,20 @@
                     $('#display-slider').prop('checked', true);
                 }
 
-                if (optionsValues.hasOwnProperty('mapboxAPIKEY') && optionsValues.mapboxAPIKEY !== '') {
+                //detect Webgl
+                var canvas = document.createElement('canvas');
+                var experimental = false;
+                var gl;
+
+                try { gl = canvas.getContext("webgl"); }
+                catch (x) { gl = null; }
+
+                if (gl == null) {
+                    try { gl = canvas.getContext("experimental-webgl"); experimental = true; }
+                    catch (x) { gl = null; }
+                }
+
+                if (optionsValues.hasOwnProperty('mapboxAPIKEY') && optionsValues.mapboxAPIKEY !== '' && gl == null) {
                     // change "button" layers
                     delete mapController.baseLayers['OpenStreetMap'];
                     delete mapController.baseLayers['ESRI Aerial'];
diff --git a/lib/Service/GeophotoService.php b/lib/Service/GeophotoService.php
index 00f7631cb..a677b03d2 100644
--- a/lib/Service/GeophotoService.php
+++ b/lib/Service/GeophotoService.php
@@ -95,7 +95,7 @@ public function getAllFromDB($userId) {
                 $file_object->type = $file->getType();
                 $file_object->mime = $file->getMimetype();
                 $file_object->lastmod = $file->getMTime();
-                $file_object->size = $file->getSize;
+                $file_object->size = $file->getSize();
                 $file_object->path = $path;
                 $file_object->hasPreview = in_array($cacheEntry->getMimeType(), $previewEnableMimetypes);
                 $filesById[] = $file_object;