WIP: Bug fixes for gruntfile