Minor updates for recent iOS toolchain.