Small timeline fixes and cleanup