Fix some things that got overwritten along the way.