Resolve problems introduced on Unix systems due to Windows portage