Some missing changes for dump/restore alias stuff