Refine entrance presets (fixes #1757)