Fixed some things about network devices management