Fixes missed - squash with previous

Not sure about record.inName but at least it won't throw