Further fix cleanups.