Fixes for Ibank classes