Fixes for speed tagging