Rework build.