StochSS related fixes