Fixes for "grunt build"