more fixes to infrastructure