Db/require fixes for release

Fixes for require.js