Add missing proxies
Add patch
Fix after tests