Package dependency fixes - 007
web.js fixes - 008