Some more fixes