Fixing some installation issues