[transition] Fix small issues for compatibility