APN and GCM message fixes