Fixes for new controller API