Fix some issues with timer interleaving