Get rid of some warnings and excess couts