A couple of library compatibility fixes.