bugfixes to make it work with grunt again