More compile warnings cleaned up.