Fix some installation problem