Additional minor changes