Small fixes
Updated CHANGELOG