Final fixes for spell checking