Fixing some controller stuff