Minor fixes and a typo