Upstream fixes for NanoHTTPD