Various tweaks to deal with the server being a bit stubborn