Fix some nasty annoyances.
Fixed some more annoyances.