Small fixes proposed by professor Edson