Fix compile errors created from changeset 29058.