more instr and instr fixes