little compat changes