Some more fixes for modems
Add some more D defs
Fix