Minor factory changes