Fixed some references and inclusions