Some slight tweaks to make Grunt work