More bug fixes from the recent foundation/config changes