More unmappable characters blown away

Change-Id: I17043504c087ae123f7b9197e9703844d4a3f689