More /cage tweaks