Fix single mode problems