diff --git a/src/apps/icon-o-matic/gui/SavePanel.cpp b/src/apps/icon-o-matic/gui/SavePanel.cpp
index cb62e11ded..3e4f0b184f 100644
--- a/src/apps/icon-o-matic/gui/SavePanel.cpp
+++ b/src/apps/icon-o-matic/gui/SavePanel.cpp
@@ -167,8 +167,9 @@ SavePanel::MessageReceived(BMessage* message)
 	// Handle messages from controls we've added
 	switch (message->what) {
 		case MSG_FORMAT:
-			// TODO: make this behaviour a setting
+			fExportMode = ExportMode();
 			AdjustExtension();
+				// TODO: make this behaviour a setting
 			_EnableSettings();
 			break;
 		case MSG_SETTINGS:
diff --git a/src/apps/icon-o-matic/gui/ShapeListView.cpp b/src/apps/icon-o-matic/gui/ShapeListView.cpp
index 6a00965176..dc78ee1958 100644
--- a/src/apps/icon-o-matic/gui/ShapeListView.cpp
+++ b/src/apps/icon-o-matic/gui/ShapeListView.cpp
@@ -550,6 +550,7 @@ ShapeListView::_UpdateMenu()
 
 	fDuplicateMI->SetEnabled(gotSelection);
 	fResetTransformationMI->SetEnabled(gotSelection);
+	fFreezeTransformationMI->SetEnabled(gotSelection);
 	fRemoveMI->SetEnabled(gotSelection);
 }
 
diff --git a/src/apps/icon-o-matic/shape/commands/AddPathsCommand.cpp b/src/apps/icon-o-matic/shape/commands/AddPathsCommand.cpp
index e2a1439726..c633ef3c9b 100644
--- a/src/apps/icon-o-matic/shape/commands/AddPathsCommand.cpp
+++ b/src/apps/icon-o-matic/shape/commands/AddPathsCommand.cpp
@@ -60,10 +60,10 @@ AddPathsCommand::Perform()
 {
 	status_t ret = B_OK;
 
-	// add shapes to container
+	// add paths to container
 	int32 index = fIndex;
 	for (int32 i = 0; i < fCount; i++) {
-		if (fPaths[i] && !fContainer->AddPath(fPaths[i]/*, index*/)) {
+		if (fPaths[i] && !fContainer->AddPath(fPaths[i], index)) {
 			ret = B_ERROR;
 			// roll back
 			for (int32 j = i - 1; j >= 0; j--)
@@ -81,7 +81,7 @@ AddPathsCommand::Perform()
 status_t
 AddPathsCommand::Undo()
 {
-	// remove shapes from container
+	// remove paths from container
 	for (int32 i = 0; i < fCount; i++) {
 		fContainer->RemovePath(fPaths[i]);
 	}