Some more fixes...