Corrections to get_native_pixelscale()
Merge branch 'cleanup'