fixes for IRB problems