controllers fixes