Minor repairs per jriegel/jmaustpc (fixes from wandererfan)