Small patches to the controller for custom stores.