Fix some more controllers to work with the new collections