Apple platforms compatibility fixes