Fix constructors issues

Fixed couple of constructor issues