Various changes after analyzing in IDEA.