Several fixes
...