Minor changes to HttpHandler