Correct some desgin problems.