Fix X install problems