Spectator fixes
/home fixes