Minor tweak around rollback subcycle