Added install fixes