Apply remarks from Freling from IRC