Net fixes

These two commits address bugs for which I do not believe existing Issues have been created.