fixes to c6