Fix: some bugs in iso environment