Fixed constructor calls