... and more fixes