Git-disaster fixes and some server changes