Fixed a few bugs
Fixed some bugs