Minor changes to httphandler