Some Graphic Fixes