Fixed other bugs