net: minor fixes
nothing
Makefile: minor fix
util: minor improvements
Fixes & refactoring