Fixing dist issues