Fix spelling error
Misc fixes