fix up a few missing bits