diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml
index 9c3fb9d5c21e6..6dea6f7f6b3e7 100644
--- a/android-project/app/src/main/AndroidManifest.xml
+++ b/android-project/app/src/main/AndroidManifest.xml
@@ -4,8 +4,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.mamedev.mame"
-      android:versionCode="235"
-      android:versionName="0.235"
+      android:versionCode="236"
+      android:versionName="0.236"
       android:installLocation="auto">
 
     <!-- OpenGL ES 2.0 -->
diff --git a/hash/apxen_flop.xml b/hash/apxen_flop.xml
index cfd9b7d267621..e3b36f700ec93 100644
--- a/hash/apxen_flop.xml
+++ b/hash/apxen_flop.xml
@@ -20,13 +20,14 @@ license:CC0
 	</software>
 
 	<!-- Unknown if this is anything official -->
-	<software name="diag">
+	<!-- disk image is missing copy protection information -->
+	<software name="diag" supported="no">
 		<description>Various Diags, XEEROM</description>
 		<year>1986</year>
 		<publisher>ACT</publisher>
 		<part name="flop1" interface="floppy_3_5">
 			<dataarea name="flop" size="705879">
-				<rom name="diag.dsk" size="705879" crc="9d48118f" sha1="2ba690bcc443fd1b02d5eb3017ea12d6172c6985"/>
+				<rom name="diag.dsk" size="705879" crc="9d48118f" sha1="2ba690bcc443fd1b02d5eb3017ea12d6172c6985" status="baddump"/>
 			</dataarea>
 		</part>
 	</software>
diff --git a/hash/pc8001mk2_flop.xml b/hash/pc8001mk2_flop.xml
index a8dd3e69b1193..d0ee644837042 100644
--- a/hash/pc8001mk2_flop.xml
+++ b/hash/pc8001mk2_flop.xml
@@ -81,17 +81,6 @@ Bon Bon, Bon Bon, Compaq, Aug 83, Aug 83,
 		</part>
 	</software>
 
-	<software name="n80diska" cloneof="n80diskb">
-		<description>N80 Disk BASIC (alt)</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
-		<part name="flop1" interface="floppy_5_25">
-			<dataarea name="flop" size="348848">    <!-- Data CRC16: 34301 -->
-				<rom name="n80 basic (1983)(microsoft - nec).d88" size="348848" crc="ff9416a4" sha1="3321c6a723545ef7f413a372683a1e40ef7ea4ef"/>
-			</dataarea>
-		</part>
-	</software>
-
 	<software name="pc80sys">
 		<description>PC-8001mkII System Disk</description>
 		<year>19??</year>
diff --git a/hash/pc8801_flop.xml b/hash/pc8801_flop.xml
index 148ec69b12535..8d66982b835a8 100644
--- a/hash/pc8801_flop.xml
+++ b/hash/pc8801_flop.xml
@@ -48464,17 +48464,6 @@ loderuna - pc8801       Device Floppy Disk load failed: Invalid image
 		</part>
 	</software>
 
-	<software name="fullfire">
-		<description>Full Fire &amp; Other Old Games</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
-		<part name="flop1" interface="floppy_5_25">
-			<dataarea name="flop" size="348848">
-				<rom name="full fire &amp; other old games.d88" size="348848" crc="9eec8b75" sha1="0229b1e62264647baf93b126674ca7ab304859ad"/>
-			</dataarea>
-		</part>
-	</software>
-
 	<software name="fuyudego">
 		<description>Fuyu de Gozaru</description>
 		<year>19??</year>
diff --git a/makefile b/makefile
index b5151d6158193..d9cf4210e34a6 100644
--- a/makefile
+++ b/makefile
@@ -1756,14 +1756,14 @@ endif
 
 ifeq (posix,$(SHELLTYPE))
 $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
-	@echo '#define BARE_BUILD_VERSION "0.235"' > $@
+	@echo '#define BARE_BUILD_VERSION "0.236"' > $@
 	@echo 'extern const char bare_build_version[];' >> $@
 	@echo 'extern const char build_version[];' >> $@
 	@echo 'const char bare_build_version[] = BARE_BUILD_VERSION;' >> $@
 	@echo 'const char build_version[] = BARE_BUILD_VERSION "W ($(NEW_GIT_VERSION))";' >> $@
 else
 $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
-	@echo #define BARE_BUILD_VERSION "0.235" > $@
+	@echo #define BARE_BUILD_VERSION "0.236" > $@
 	@echo extern const char bare_build_version[]; >> $@
 	@echo extern const char build_version[]; >> $@
 	@echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@
diff --git a/src/osd/modules/debugger/qt/debuggerview.cpp b/src/osd/modules/debugger/qt/debuggerview.cpp
index 263fcfe1e7382..a1c8bcf2aec37 100644
--- a/src/osd/modules/debugger/qt/debuggerview.cpp
+++ b/src/osd/modules/debugger/qt/debuggerview.cpp
@@ -331,8 +331,8 @@ void DebuggerView::copyVisibleSlot()
 		for (uint32_t col = 0; col < visarea.x; ++col)
 			text += wchar_t(viewdata[col].byte);
 		std::string::size_type const nonblank = text.find_last_not_of("\t\n\v\r ");
-		if ((nonblank != std::string::npos) && (nonblank >= start))
-			text.resize(nonblank + 1);
+		if (nonblank != std::string::npos)
+			text.resize((std::max)(start, nonblank + 1));
 		text += "\n";
 	}
 
diff --git a/src/osd/modules/debugger/win/debugviewinfo.cpp b/src/osd/modules/debugger/win/debugviewinfo.cpp
index d6e94c1ba3e44..6965d032dfafc 100644
--- a/src/osd/modules/debugger/win/debugviewinfo.cpp
+++ b/src/osd/modules/debugger/win/debugviewinfo.cpp
@@ -320,8 +320,8 @@ void debugview_info::handle_context_menu(unsigned command)
 				for (uint32_t col = 0; col < visarea.x; ++col)
 					text += wchar_t(viewdata[col].byte);
 				std::wstring::size_type const nonblank = text.find_last_not_of(L"\t\n\v\r ");
-				if ((nonblank != std::wstring::npos) && (nonblank >= start))
-					text.resize(nonblank + 1);
+				if (nonblank != std::wstring::npos)
+					text.resize((std::max)(start, nonblank + 1));
 				text += L"\r\n";
 			}