Fixes for non-retina and copy changes