Fixes #3100. Fix spell and spaces issues