Fixes, new Controllers