+ fix build failure, fix warning