FInal clean up of warnings.