Took care of all the code warnings.