more fixes to run from scratch