Yesterday
Bunch of server compile fixes to get ready to merge