Make small changes to make client mode easier