Compat with spinach 0.8.x