Redo some stuff for new build environment