Make machine ID more reliable