diff --git a/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/EditableListCtrl.cpp b/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/EditableListCtrl.cpp
index 7ebdce970e..1f5953d83b 100644
--- a/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/EditableListCtrl.cpp
+++ b/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/EditableListCtrl.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -76,7 +76,8 @@ void EditableListCtrl::OnMouseEvent(wxMouseEvent& event)
 		wxPoint pt = event.GetPosition();
 		int col = GetColumnAtPosition(pt);
 
-		wxCHECK2(col >= 0 && col < (int)m_ColumnTypes.size(), return);
+		if (col < 0 || col >= static_cast<int>(m_ColumnTypes.size()))
+			return;
 
 		int flags;
 		long row = HitTest(pt, flags);
diff --git a/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasDialog.cpp b/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasDialog.cpp
index 9abd5ac218..42e4af26b4 100644
--- a/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasDialog.cpp
+++ b/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasDialog.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -51,7 +51,7 @@ AtlasDialog::AtlasDialog(wxWindow* parent, const wxString& title, const wxSize&
 
 
 	wxBoxSizer* buttonSizer = new wxBoxSizer(wxHORIZONTAL);
-	mainSizer->Add(buttonSizer, wxSizerFlags().Expand().Align(wxALIGN_RIGHT).Border(wxALL, 5));
+	mainSizer->Add(buttonSizer, wxSizerFlags().Expand().Border(wxALL, 5));
 
 	buttonSizer->Add(new wxButton(this, wxID_OK, _("OK")), wxSizerFlags().Border(wxRIGHT, 25));
 	buttonSizer->Add(new wxButton(this, wxID_CANCEL, _("Cancel")), wxSizerFlags().Border(wxRIGHT, 5));