Minor fixes.

6 jobs for migration in 24 minutes and 13 seconds (queued for 1 second)