Fix some factories