more isa fixes