Fix most of what's left.