Some corrections for past commit