minor fixes to make last commit build