Add set-immediate shim
Finish objects after actions