Fixes for using the proper iOS vs Mac vs Web Push certificates in APS