Fix initialization variables