More Graphics Fixes