Fixes to QueryClient