Fix typo causing duplicate jobs, consistency tweaks