Fix other bugs