Minors ajustments