Put local machine id indication in more sensible place