And more fixes