Fix initial-setup homesick weirdness