Miscellaneous fixes to arenas and controllers