Fixes the issues raised in the first-run experience PR (#2027)