Test fixes from the rollup