Update CHANGELOG and minor fixes