Fixed some other bugs