432 more fixes