misc foundation-related changes