diff --git a/Makefile b/Makefile
index 0640febb..a330f71f 100644
--- a/Makefile
+++ b/Makefile
@@ -126,8 +126,8 @@ ifdef ARCH_MAC
 	# Clean up and sign bundle
 	xattr -cr dist/$(TARGET).app
 	codesign --sign "Developer ID Application: Andrew Belt (VRF26934X5)" --verbose dist/$(TARGET).app
-	codesign --verify --verbose dist/$(TARGET).app
-	spctl --assess --verbose dist/$(TARGET).app
+	codesign --verify --deep --strict --verbose=2 dist/$(TARGET).app
+	spctl -a -t exec -vv dist/$(TARGET).app
 	# Make ZIP
 	cd dist && zip -q -9 -r Rack-$(VERSION)-$(ARCH).zip $(TARGET).app
 endif
diff --git a/src/main.cpp b/src/main.cpp
index e187bada..64e4e80a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -72,10 +72,14 @@ int main(int argc, char *argv[]) {
 			case 'h': {
 				settings::headless = true;
 			} break;
+			// Due to Mac app translocation and Apple adding a -psn... flag when launched, disable screenshots on Mac for now.
+#if !defined ARCH_MAC
 			case 'p': {
 				screenshot = true;
+				// If parsing number failed, use default value
 				sscanf(optarg, "%f", &screenshotZoom);
 			} break;
+#endif
 			case 's': {
 				asset::systemDir = optarg;
 			} break;
@@ -107,6 +111,12 @@ int main(int argc, char *argv[]) {
 	// Log environment
 	INFO("%s v%s", app::APP_NAME.c_str(), app::APP_VERSION.c_str());
 	INFO("%s", system::getOperatingSystemInfo().c_str());
+	std::string argsList;
+	for (int i = 0; i < argc; i++) {
+		argsList += argv[i];
+		argsList += " ";
+	}
+	INFO("Args: %s", argsList.c_str());
 	if (settings::devMode)
 		INFO("Development mode");
 	INFO("System directory: %s", asset::systemDir.c_str());