Small updates to WebHandler code