FIx some bugs.