diff --git a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/managers/StateUpdater.java b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/managers/StateUpdater.java
index e078e9df0..8355bbc59 100644
--- a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/managers/StateUpdater.java
+++ b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/managers/StateUpdater.java
@@ -206,6 +206,8 @@ public class StateUpdater extends PlayerEventListenerHelper {
     private void restoreSpeed() {
         if (mController.getLengthMs() - mController.getPositionMs() > 30_000) {
             mController.setSpeed(mSpeed);
+        } else {
+            mController.setSpeed(1.0f); // speed may be changed before, so do reset to default
         }
     }
 
diff --git a/smartyoutubetv2/src/main/res/layout/mod_lb_control_bar.xml b/smartyoutubetv2/src/main/res/layout/mod_lb_control_bar.xml
index a3a12cef9..e4f987dc1 100644
--- a/smartyoutubetv2/src/main/res/layout/mod_lb_control_bar.xml
+++ b/smartyoutubetv2/src/main/res/layout/mod_lb_control_bar.xml
@@ -15,6 +15,8 @@
      limitations under the License.
 -->
 
+<!-- Note: class names was changed to locale ones -->
+
 <com.liskovsoft.smartyoutubetv2.tv.ui.mod.leanback.playerglue.ControlBar xmlns:android="http://schemas.android.com/apk/res/android"
                                      android:id="@+id/control_bar"
                                      android:layout_width="wrap_content"
diff --git a/smartyoutubetv2/src/main/res/layout/mod_lb_playback_transport_controls_row.xml b/smartyoutubetv2/src/main/res/layout/mod_lb_playback_transport_controls_row.xml
index 4f33a2705..e442074b7 100644
--- a/smartyoutubetv2/src/main/res/layout/mod_lb_playback_transport_controls_row.xml
+++ b/smartyoutubetv2/src/main/res/layout/mod_lb_playback_transport_controls_row.xml
@@ -15,6 +15,8 @@
   ~ limitations under the License.
   -->
 
+<!-- Note: class names was changed to locale ones -->
+
 <!-- Note: clipChildren/clipToPadding false are needed to apply shadows to child
      views with no padding of their own. Also to allow for negative margin on description. -->