Improve build hygiene