Fix Strategy Editor state and normalize lag