fixes, proxy