Fix some bugs.
Fix one more bug.