More proxy fixes..