Further cleanup of compile warnings