Small fixes suggested by Scott Marlow.