Apn settings fixes / code maintainence (1/2)