diff --git a/src/libCom/timer/epicsTimer.h b/src/libCom/timer/epicsTimer.h
index 1eb668c40..b3bd9aab9 100644
--- a/src/libCom/timer/epicsTimer.h
+++ b/src/libCom/timer/epicsTimer.h
@@ -135,9 +135,7 @@ inline double epicsTimer::getExpireDelay ()
         }
         return delay;
     }
-    else {
-        return - DBL_MAX;
-    }
+    return - DBL_MAX;
 }
 
 extern "C" {
diff --git a/src/libCom/timer/timer.cpp b/src/libCom/timer/timer.cpp
index 7e9d591f9..4fcb04b31 100644
--- a/src/libCom/timer/timer.cpp
+++ b/src/libCom/timer/timer.cpp
@@ -157,9 +157,7 @@ epicsTimer::expireInfo timer::getExpireInfo () const
     if ( this->curState == statePending || this->queue.pExpireTmr == this ) {
         return expireInfo ( true, this->exp );
     }
-    else {
-        return expireInfo ( false, epicsTime() );
-    }
+    return expireInfo ( false, epicsTime() );
 }
 
 void timer::show ( unsigned int level ) const
diff --git a/src/libCom/timer/timerPrivate.h b/src/libCom/timer/timerPrivate.h
index 779c2364d..38411d242 100644
--- a/src/libCom/timer/timerPrivate.h
+++ b/src/libCom/timer/timerPrivate.h
@@ -114,7 +114,7 @@ class timerQueueActive : public epicsTimerQueueActive,
     public timerQueueActiveMgrPrivate {
 public:
     timerQueueActive ( bool okToShare, unsigned priority );
-    ~timerQueueActive () = 0;
+    virtual ~timerQueueActive () = 0;
     epicsTimer & createTimer ();
     void show ( unsigned int level ) const;
     bool sharingOK () const;
diff --git a/src/libCom/timer/timerQueue.cpp b/src/libCom/timer/timerQueue.cpp
index 85baae980..a63230c18 100644
--- a/src/libCom/timer/timerQueue.cpp
+++ b/src/libCom/timer/timerQueue.cpp
@@ -151,6 +151,7 @@ double timerQueue::process ( const epicsTime & currentTime )
             return DBL_MAX;
         }
     }
+    return DBL_MAX;		// Never here; compiler happy
 }
 
 epicsTimer & timerQueue::createTimer ()