Changes required to fix Gizmo