Fix these.
Clear up a few things.