fixes for PR and IR