Fixed a couple of little things.

Just merging a couple of little fixes.