Small fixes

This is just a PR to collect small fixes from feedback on the release.