PR changes, mostly sanity checking