Device fixes

Distribution changes
Network fixes