Fix Bugs.