Minor changes to get grunt working