Fixes some networking issues