Fixes to GUI types
Fix editor canvas bug found by TR