Fix minor bugs with legacy networks