#34: Fixed some bugs.