Update changelog and various fixes