Update changelog
Fix problems reported by pscan