Fix the install problems