Fixed bugs
Fixed some bugs