Potential fixes for linux, more progress on network base