more apn fixes