Apn settings fixes / code maintainence