more fixes

9 jobs for small_fixes in 8 minutes and 4 seconds (queued for 1 second)