Fixed installation issues