More and more fixes.