diff --git a/src/devices/machine/i8255.cpp b/src/devices/machine/i8255.cpp
index ff78e63ab01..c136d7a02dd 100644
--- a/src/devices/machine/i8255.cpp
+++ b/src/devices/machine/i8255.cpp
@@ -473,6 +473,11 @@ uint8_t i8255_device::read_pc()
 	{
 		// read data from port
 		data |= m_in_pc_cb(0) & mask;
+		if (port_c_upper_mode() == MODE_OUTPUT)
+		{
+			// read data from output latch
+			data |= m_output[PORT_C] & mask;
+		}
 	}
 
 	return data;
diff --git a/src/lib/formats/imd_dsk.cpp b/src/lib/formats/imd_dsk.cpp
index cce87fa64f2..8476da6ac38 100644
--- a/src/lib/formats/imd_dsk.cpp
+++ b/src/lib/formats/imd_dsk.cpp
@@ -492,10 +492,13 @@ bool imd_format::load(io_generic *io, uint32_t form_factor, floppy_image *image)
 			}
 		}
 
-		if(fm)
-			build_pc_track_fm(track, head, image, cell_count, sector_count, sects, gap_3);
-		else
-			build_pc_track_mfm(track, head, image, cell_count, sector_count, sects, gap_3);
+		if(sector_count) {
+			if(fm) {
+				build_pc_track_fm(track, head, image, cell_count, sector_count, sects, gap_3);
+			} else {
+				build_pc_track_mfm(track, head, image, cell_count, sector_count, sects, gap_3);
+			}
+		}
 
 		for(int i=0; i<sector_count; i++)
 			if(sects[i].data && (sects[i].data < &img[0] || sects[i].data >= (&img[0] + size)))
diff --git a/src/lib/formats/td0_dsk.cpp b/src/lib/formats/td0_dsk.cpp
index 588603a40f5..f31150eb45d 100644
--- a/src/lib/formats/td0_dsk.cpp
+++ b/src/lib/formats/td0_dsk.cpp
@@ -889,7 +889,9 @@ bool td0_format::load(io_generic *io, uint32_t form_factor, floppy_image *image)
 				else
 					return false; // single side 3.5?
 				break;
-			}
+			} else
+				image->set_variant(floppy_image::SSDD);
+			break;
 			/* no break */
 		case 3:
 			if(head_count == 2)