Minnor fixes on some variables