grunt fix and adaption