Fixes about restart events