A bunch of little fixes

Sean --

Here's a bunch of little fixes.