More tweaks in players handling