Add enable/disable option to server
Eliminate warnings