Some fixes to the implementation of BasicProxy