Fixes made in controllers