Small fixes for NO_SERVER_RESPONSE.