- Fix some bugs reported.