Manual merg

Remove mulitple errors from compilation regarding net connections.