Devpatch 1.8 fixups

I think the 1.8 test issues are not critical, but we can discuss in comments.