Fix several compile warnings added in some of my recent commits