And more fixes.