More 2.5 compat.