Fixed various nits