Speculative fixes