Much more fixes