Fixed some bugs?