Fix missing supervisor id, stray Source reference