glx + proxy improvements