Small proxy improvements