Fix up some less mess.