Updated grunt and fixes for AMD