Fixed some variables