Dead-reckoning fixes.