Fix a few missing changes from #22