Some corrections for previous commit