... and some more fixes