Various tiny fixes and transitions.