Fix issues with timing delays