Improve 6.5 compat.