Fixed MAC compatibility issues

Change-Id: I8f8290774b443e24891745016ddc79e9f14c9d94