Fixes for deferred