Fixed a few bugs with the grunt build step