sec05 and sec06 fixes