fixes for proxying