Fixes for compatibility with several resolutions