Minor bug-fixes
Typo corrections