Fix styleguide issue on if statement
Fix changelog spelling error