Fixed a few nits