Fixing misc issues when on a fresh machine