Fixed some installation glitches