add fixes for momo's CV