Speculative warning fixes