Fixes from CDISC internal review