IBSSC fixes