Last minute install fixes