and more fixes!