diff --git a/stepmania/src/smpackage/SMPackageUtil.cpp b/stepmania/src/smpackage/SMPackageUtil.cpp
index d755f90f79..ed48d3ea8e 100644
--- a/stepmania/src/smpackage/SMPackageUtil.cpp
+++ b/stepmania/src/smpackage/SMPackageUtil.cpp
@@ -79,7 +79,7 @@ void SetDefaultInstallDir( int iInstallDirIndex )
 	// move the specified index to the top of the list
 	CStringArray asInstallDirs;
 	GetStepManiaInstallDirs( asInstallDirs );
-	ASSERT( iInstallDirIndex > 0  &&  iInstallDirIndex < asInstallDirs.size() );
+	ASSERT( iInstallDirIndex >= 0  &&  iInstallDirIndex < asInstallDirs.size() );
 	CString sDefaultInstallDir = asInstallDirs[iInstallDirIndex];
 	asInstallDirs.erase( asInstallDirs.begin()+iInstallDirIndex );
 	asInstallDirs.insert( asInstallDirs.begin(), sDefaultInstallDir );
diff --git a/stepmania/src/smpackage/onvertThemeDlg.cpp b/stepmania/src/smpackage/onvertThemeDlg.cpp
index bb4d2c370f..5f3f57fba1 100644
--- a/stepmania/src/smpackage/onvertThemeDlg.cpp
+++ b/stepmania/src/smpackage/onvertThemeDlg.cpp
@@ -35,7 +35,6 @@ void ConvertThemeDlg::DoDataExchange(CDataExchange* pDX)
 	DDX_Control(pDX, IDC_BUTTON_ANALYZE_METRICS, m_buttonAnalyzeMetrics);
 	DDX_Control(pDX, IDC_BUTTON_EDIT_METRICS, m_buttonEditMetrics);
 	DDX_Control(pDX, IDC_BUTTON_ANALYZE, m_buttonAnalyze);
-	DDX_Control(pDX, IDC_BUTTON_CONVERT, m_buttonConvert);
 	DDX_Control(pDX, IDC_LIST_THEMES, m_listThemes);
 	//}}AFX_DATA_MAP
 }
@@ -98,7 +97,6 @@ void ConvertThemeDlg::OnSelchangeListThemes()
 {
 	// TODO: Add your control notification handler code here
 	BOOL bSomethingSelected = m_listThemes.GetCurSel() != LB_ERR;
-	m_buttonConvert.EnableWindow( bSomethingSelected );
 	m_buttonAnalyze.EnableWindow( bSomethingSelected );
 	m_buttonEditMetrics.EnableWindow( bSomethingSelected );
 	m_buttonAnalyzeMetrics.EnableWindow( bSomethingSelected );
diff --git a/stepmania/src/smpackage/onvertThemeDlg.h b/stepmania/src/smpackage/onvertThemeDlg.h
index 7a892f2488..76710b8d4c 100644
--- a/stepmania/src/smpackage/onvertThemeDlg.h
+++ b/stepmania/src/smpackage/onvertThemeDlg.h
@@ -22,7 +22,6 @@ public:
 	CButton	m_buttonAnalyzeMetrics;
 	CButton	m_buttonEditMetrics;
 	CButton	m_buttonAnalyze;
-	CButton	m_buttonConvert;
 	CListBox	m_listThemes;
 	//}}AFX_DATA