Controller Fixes