fix some variables