Modem fixes

Change-Id: Iaca879ea9ffc1ae211b1cbd92a4ad2dcf8b73740