05/06 fixes