More and more fixes