Further tweaks
Failing inference regression test