fixes in the Factories (except Packet factory has burnt down)