Updates to support ssg_core improvements.