fixes for new tool/grunt path