Various cleanups, plus set static MAC to keep the hostname