Fixes on performance controllers