More grunt 4.0 update fixes