Got rid of warnings (again).