FIXUP: Graphic layer refactor bug fixes.