Fix a load of bugs
Fix more bugs
Test fix now that remote_client is required