Fixed some bugs, again...