Minor changes - still no forwarding for I-type instruction support