Fixing some controller API issues