Fixes for immediateThen