Merge branch 'small-fixes-for-mctp'