Fixes for game control manager

We still need to talk about some points ! :-)