Fixed multiple timeline errors