Minor tweaks to JobBuilder