Mod compat + Recursion fiddling