Improve Mac Detection