Fix some inconsistencies, still does not update game/title