Some more last changes