Small design improvements.