Minors improvements