More ISL fixes