Fixes for non-local client