Some further minor changes