diff --git a/src/devices/bus/ieee488/hp9895.cpp b/src/devices/bus/ieee488/hp9895.cpp
index 30df3426ac1..6abe8bc773d 100644
--- a/src/devices/bus/ieee488/hp9895.cpp
+++ b/src/devices/bus/ieee488/hp9895.cpp
@@ -48,8 +48,8 @@
 	Hardware Maintenance Manual
 
 	TODO/Issues:
-	* floppy_image_device sometimes reports the wrong state for ready &
-	  wpt signals
+	* floppy_image_device sometimes reports the wrong state for wpt
+	  signal
 	* IBM mode hasn't been tested yet
 
 *********************************************************************/
@@ -232,10 +232,6 @@ void hp9895_device::device_reset()
 	m_timeout_timer->reset();
 	m_byte_timer->reset();
 	m_half_bit_timer->reset();
-#if 0
-	// DEBUG DEBUG DEBUG DEBUG
-	for (auto& r : m_ready) r = 2;
-#endif
 }
 
 void hp9895_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
@@ -705,19 +701,6 @@ READ8_MEMBER(hp9895_device::switches2_r)
 
 void hp9895_device::floppy_ready_cb(floppy_image_device *floppy , int state)
 {
-#if 0
-	// DEBUG DEBUG DEBUG DEBUG
-	for (unsigned i = 0; i < 2; i++) {
-		if (floppy == m_drives[ i ]->get_device()) {
-			if (m_ready[ i ] != state) {
-				LOG(("Ready %u=%d\n" , i , state));
-				m_ready[ i ] = state;
-			}
-			break;
-		}
-	}
-#endif
-
 	if (state) {
 		// Set Disk Changed flag when a drive is not ready
 		for (unsigned i = 0; i < 2; i++) {
diff --git a/src/devices/bus/ieee488/hp9895.h b/src/devices/bus/ieee488/hp9895.h
index 29d776e6d13..5837792de82 100644
--- a/src/devices/bus/ieee488/hp9895.h
+++ b/src/devices/bus/ieee488/hp9895.h
@@ -109,10 +109,6 @@ private:
 	uint8_t m_sync_cnt;	// U28 & U73
 	bool m_hiden;
 	bool m_mgnena;
-#if 0
-	// DEBUG DEBUG DEBUG DEBUG
-	int m_ready[ 2 ];
-#endif
 
 	// Timers
 	emu_timer *m_timeout_timer;
diff --git a/src/devices/machine/fdc_pll.cpp b/src/devices/machine/fdc_pll.cpp
index bec0102f95c..ef93eda920d 100644
--- a/src/devices/machine/fdc_pll.cpp
+++ b/src/devices/machine/fdc_pll.cpp
@@ -80,7 +80,7 @@ int fdc_pll_t::feed_read_data(attotime &tm, const attotime& edge, const attotime
 	ctime = next;
 	tm = next;
 
-	if(edge.is_never() || edge >= next) {
+	if(edge.is_never() || edge > next) {
 		// No transition in the window means 0 and pll in free run mode
 		phase_adjust = attotime::zero;
 		return 0;