More override warning cleanup.