Smooth out a few transitions