Patched up imports after netserver renaming.