Cleanup compile warnings