Part12 fixes