Fixes for deps.js and adjustments for no-dep build