Small improvements in the chapter Components