More proxy changes