Fixes locking issue, quietens some potential message floods. Signed-off-by: Ben Greear <greearb@candelatech.com>