Minors fixs