builtin/{network,client_file}: Tweak and fix minor things