OTR improvements, affects #443 and 505