WIP fixes for dojo build