non-nls warnings fixed