Fixed 2 other bugs