Minors updates