Fix several more compile warnings