Fixing the instr_task and related modules (under work)