make deferred action not temporary
minor optimizations