fixed lui/hazards (hopefully)