Updates to ensure self submission works.