2 more fixes.