some previous commit corrections