1.9.x compat changes