Improvements on activePlayer switch