Fix some installation issues