and more fixes