DEV::Fixed some bugs