1.8 compat changes