IBT: fixes for samples