Fix web resource and corresponding utilities