Changes for new build

Don't merge yet. This goes with an internal PR.