A bunch of smaller fixes

4 jobs for remake in 1 minute and 34 seconds (queued for 1 second)
latest