Miscellaneous fixes
Use controllers