controller dependency fixes

[merge]