Bug Fix: Fix some bugs.