fixes in fs and net