Fixed grunt build/dist issues