Small additions before lift to SEQR code