Act on @otfrom's comments