diff --git a/source/Ox.UI/js/Video/Ox.SmallVideoTimeline.js b/source/Ox.UI/js/Video/Ox.SmallVideoTimeline.js
index 6eb3c95b..c28b807a 100644
--- a/source/Ox.UI/js/Video/Ox.SmallVideoTimeline.js
+++ b/source/Ox.UI/js/Video/Ox.SmallVideoTimeline.js
@@ -213,12 +213,12 @@ Ox.SmallVideoTimeline = function(options, self) {
             self.$image.options({
                 'in': value
             });
-            setPointMarker('in');
+            self.options.type == 'editor' && setPointMarker('in');
         } else if (key == 'out') {
             self.$image.options({
                 out: value
             });
-            setPointMarker('out');
+            self.options.type == 'editor' && setPointMarker('out');
         } else if (key == 'paused') {
             self.$positionMarker[
                 self.options.paused ? 'addClass' : 'removeClass'
diff --git a/source/Ox.UI/js/Video/Ox.VideoPlayer.js b/source/Ox.UI/js/Video/Ox.VideoPlayer.js
index 05f496de..bcbebec3 100644
--- a/source/Ox.UI/js/Video/Ox.VideoPlayer.js
+++ b/source/Ox.UI/js/Video/Ox.VideoPlayer.js
@@ -2337,6 +2337,7 @@ Ox.VideoPlayer = function(options, self) {
             setSizes();
         } else if (key == 'in' || key == 'out') {
             self.options.paused && setMarkers();
+            self.$timeline.options(key, value);
         } else if (key == 'muted') {
             toggleMuted();
         } else if (key == 'paused') {
diff --git a/tools/build/build.py b/tools/build/build.py
index e87bf29f..c5087c9a 100755
--- a/tools/build/build.py
+++ b/tools/build/build.py
@@ -92,7 +92,9 @@ def build_oxjs(geo):
         data[1].append(js_dir + filename)
     filenames = filenames[0] + filenames[1]
     for filename in os.listdir(source_path + js_dir):
-        if not filename in filenames:
+        if not filename in filenames \
+                and not filename.startswith('.') \
+                and not filename.endswith('~'):
             filenames.append(filename)
     for filename in filenames:
         js += read_file(source_path + js_dir + filename) + '\n'