Some warnings eliminated.