non-nls fixes and other warning cleanup