Fixed dist issues