fixes for CLController