fix various grunt warnings

has a dependency on the earlier PR, sorry :(