Minor ajustments