Future race condition fixes and reset support.