More apn fixes