Small fixes to the request flow