more updates to make building on other machines possible.