re-fix errors due to past broken commits