Fix a couple of constructor calls