Fixed some more installation issues.