Include fixes from gaze