Cleanup + typo ( CHANGELOG )
(cherry picked from commit 3a168b3)