further CIBS_Controller fixes