Fixed some other bugs.