Fixed IB issues