Fixing singleton constructors