Fixed new install issues