Lots of tweaks to update the client to the platform