Fixes compilation errors from recent server changes