More Timeline fix ups.