Fixes to speed calculations