Some more fixes :D