Some minor last changes