Added upstream patch fixing indexing of an iterator
Corrected ownership of assistants directories