Updates: Fix some bugs.