Resolving possible clashes from Mac Recovery code