Bring hammerhead inline with new build system