Move job running till after deferred updates