Fixes from the transition