Fixed issues with restoring states in Triple and Speed