Fixing fixmes in setup_client