Fixing some failures after 5.2 code changes.