Fixing a typo and accounting for timeline changes