Fixes many container references and uses new shared methods in BaseController.