various small proposed changes

4 jobs for misc_tweaks in 4 minutes and 43 seconds