Fix and add some factories