         // If we're zooming to fill then centralise
         if zoomScale != minScale {
             // Centralise
-            contentOffset = CGPointMake((imageSize.width * zoomScale - boundsSize.width) / 2.0,
-                                        (imageSize.height * zoomScale - boundsSize.height) / 2.0)
+            contentOffset = CGPoint(x: (imageSize.width * zoomScale - boundsSize.width) / 2.0, y: (imageSize.height * zoomScale - boundsSize.height) / 2.0)
         }
         
         // Disable scrolling initially until the first pinch to fix issues with swiping on an initally zoomed in photo
-        scrollEnabled = false
+        isScrollEnabled = false
         
         // If it's a video then disable zooming
         if displayingVideo() {

            let newZoomScale = ((maximumZoomScale + minimumZoomScale) / 2.0)
            let xsize = bounds.size.width / newZoomScale
            let ysize = bounds.size.height / newZoomScale
            zoomToRect(CGRectMake(touchPoint.x - xsize / 2.0, touchPoint.y - ysize / 2.0, xsize, ysize), animated: true)
        }
        
        // Delay controls

        
        if let le = loadingError {
            le.frame = CGRectMake(
                floorcgf(x: (bounds.size.width - le.frame.size.width) / 2.0),
                floorcgf((bounds.size.height - le.frame.size.height) / 2.0),
                le.frame.size.width,
                le.frame.size.height)
