Network fixes for fd-arm