minor fixes suggested by jaredgrubb