Bug fixes and minor improvements

5 jobs for 0.20.3 in 11 minutes and 23 seconds (queued for 1 minute and 45 seconds)
latest