/* NOROO stage 7 fixes */