fixes for latest bacon + mocha