Some corrections to last commit