Fix some issues around game formatting