Tweak proposals 220 and 224 to make them work with trunnel