Fix Apple build to the last commit