Spectation mode fixes