ICU compilation fixes