Fix grunt builds
WIP