Fixing things to push to the server