Fixes for modem
More fixes
Need really rebase this tree %)