more fixes to lean man bootstrap