Fixed up build tool