Fix graphics boundings
Fix mask transformation
Merge pull request #1780 from tobytailor/gfx

Gfx fixes