More 1.8 compat