APN fixes