More job tweaks