Fixing minor installation issues