Fixed bugs that prevented Template Slots from saving correctly