Speculative fixes/defense against couple crashes