diff --git a/module/build/model.php b/module/build/model.php
index 6649445af8..3675dc1108 100644
--- a/module/build/model.php
+++ b/module/build/model.php
@@ -25,6 +25,8 @@ class buildModel extends model
      */
     public function getByID(int $buildID, bool $setImgSize = false): object|false
     {
+        if(common::isTutorialMode()) return $this->loadModel('tutorial')->getBuild();
+
         $build = $this->dao->select('t1.*, t2.name as executionName, t3.name as productName, t3.type as productType')
             ->from(TABLE_BUILD)->alias('t1')
             ->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.execution = t2.id')
diff --git a/module/tutorial/js/index.ui.js b/module/tutorial/js/index.ui.js
index 42ec3593a6..30144847da 100644
--- a/module/tutorial/js/index.ui.js
+++ b/module/tutorial/js/index.ui.js
@@ -92,7 +92,7 @@ const stepPresenters =
     },
     click: function(step)
     {
-        return highlightStepTarget((scope) => scope.$(step.target), step);
+        return highlightStepTarget((scope) => scope.$(step.target), step, {placement: 'bottom'});
     },
     clickNavbar: function(step)
     {
diff --git a/module/tutorial/model.php b/module/tutorial/model.php
index 86ddaf93b5..98e8d9b857 100644
--- a/module/tutorial/model.php
+++ b/module/tutorial/model.php
@@ -610,6 +610,7 @@ class tutorialModel extends model
         $build->deleted        = 0;
         $build->executionName  = 'Test execution';
         $build->productName    = 'Test product';
+        $build->allBugs        = '1';
         return $build;
     }