Fixing more busted deferred stuff