Fixed none null constructor and some HE issues.