fixes after grunt implementation