Fixes some bugs to help re-unify game/editor side graphics