Small corrections after the shift to combined template