Fix some regressions pointed by the proxy tests
Fix some problems uninstalling resources