F3 Spectator Fixes.

Fixed #339
Fixed #338