more fixes for request handling