fixes after Alvin's comments

14 jobs for v1.0.7-rudzinski in 40 minutes and 54 seconds (queued for 4 seconds)