Fixed up some of the warnings.