IBT: fixes for continuous