Graphics related fixes

Pareil