[#69807070] Fix some race conditions

Signed-off-by: Rick Copeland <rick@synapp.io>