Minor fixes regarding GSM