Fixed issues when not running SPS