Fix some conversions and enhance results presentation