Small changes in all controllers