Fix various present-mode problems