Fixed stupid oversights in request handling