Fixes for https://github.com/krakenjs/generator-kraken/issues/115