Some Graphics Fixes