Fixed few constructors