Fixed compilation errors
Commiting gsm testing changes