Fixed more transitions