More SCAV shenanigans