Add some WebUtil + minor changes