100 more fixes