Clean install fixes