Small compat changes