Fixes to make deleting timelines work