Some minor fixes of MDNetworkGenerator