remove compile warnings
fix test failures