Fixed the new bugs.