Fixes for aspect ratio issues