Related to https://framagit.org/vv221/play.it-games/issues/92
Related to https://framagit.org/vv221/play.it-games/issues/110
Fix https://framagit.org/vv221/play.it-games/issues/100
Fix https://framagit.org/vv221/play.it-games/issues/99