Some more fixes.