Fix typo and small chnages to get rid of warnings.