fixing errors from merge from cv-rework