Additional tweaks and support for __call on controllers