Fixes in transition manager