Minor fixes and things.