Protocol 8.40-.42 fixes, closes #272