Corrected other bugs