Updated changelog for 33a + manual fixes