fixes for bunker.js