Ch.8 first parts fixes