Fixed a few minor thing.