Additional warning cleanup.