Fixed some bugs after merge;