Correct changelog and control files