Fixes on startup selector