Further proxy changes

based on jkf comments