A couple of library compatibility fixes.
Merge branch 'master' into rdgv2