Clean some other bugs