some more fixes for gaze