Small tweaks and fixes (bunch of)

Fixing #422