Fix

Spectator fix; Cleanup fix