Test and compilation fixes from the roll-up