Cleaned up more warnings.