Changes to fix display issue for non-ASCII device names and some compile warnings...