More OSE 1.2 fixes