More fixes for the ISO module