CRATEIT-45 Fix up timing issues