5-2 fixes