Updated grunt and amd fixes