Fix of some installation bugs