Some improvements for larger build systems