Some request handling related fixes