Fixed virgin installation issues