Foundation fixes