Fix EnvironmentUtil to work with 'amd64' string