Some fixes for lower resolutions