Fixes control errors