Redo some more changes that got lost during merge