Fixing grunt and version issues