Fixes for GSM and GPRS suites