And more fixes!