Small fixes (not finished yet)

...