Some owner as source fixups and Knight's Valor