Minor fixes

3 jobs for 3.5.1-dev (queued for 12 seconds)