Graphics Fixes

Fixed several minor bugs with the graphics system.