Minor but important changes for design.