Fix installation issues