Minor fixes
extract_ins_operands improvement