Fix some minor issues

32 jobs for int-new in 7 minutes and 40 seconds (queued for 11 seconds)