Cleanups for Retina support (#24)