Some more fixes!