Seraphim: Some secret fixes to secret places

Shhh ... don't tell anyone