Special bugfix release, broken apart from
mac address detection