Various fixes for tracking safety, rate setting, and accuracy.