removed MacAddress class from newer builds
fixed code analysis issues
fixed code analysis issues