Some minors updates