- and more fixes