Graphic fixes