Various smaller fixes.

5 jobs for v0.6.2 in 21 minutes and 26 seconds (queued for 1 second)