Some minors changes