Foundation fixes and whatnot