More fixes for modem