fix some factories