Try fix build errors