Another minor changes