These are necessary to prevent breakage on server & proxy

Signed-off-by: Nick Minkler <sleaker@gmail.com>
Merge pull request #554 from Sleaker/master

Fix server throwing an error with Windows