Fixed public singleton constructors