Fixes for UsProxy provider