More and more fixes :D