more factory fixes