fix ConcurrentModificationError
fix analyzer warnings