Code style fix & CHANGELOG typo fix for bug #3522