Fix up persistent objects
Fix play stream url resolution