diff --git a/Web/Models/Entities/Audio.php b/Web/Models/Entities/Audio.php
index 158e74bf..5d6d5783 100644
--- a/Web/Models/Entities/Audio.php
+++ b/Web/Models/Entities/Audio.php
@@ -123,7 +123,7 @@ class Audio extends Media
             $start = time();
             while(file_exists($filename))
                 if(time() - $start > 5)
-                    exit("Timed out waiting for ffmpeg");
+                    exit("Timed out waiting for ffmpeg"); // TODO replace with exception
 
         } catch(UnknownCommandException $ucex) {
             exit(OPENVK_ROOT_CONF["openvk"]["debug"] ? "bash/pwsh is not installed" : VIDEOS_FRIENDLY_ERROR);
diff --git a/Web/Models/shell/processAudio.ps1 b/Web/Models/shell/processAudio.ps1
index 7bc1ab32..dd1db9ad 100644
--- a/Web/Models/shell/processAudio.ps1
+++ b/Web/Models/shell/processAudio.ps1
@@ -31,7 +31,7 @@ ffmpeg -i $audioFile -f dash -encryption_scheme cenc-aes-ctr -encryption_key $ke
 ffmpeg -i $audioFile -vn -ar 44100 "original_$token.mp3"
 Move-Item "original_$token.mp3" ($fileHash + '_fragments')
 
-Move-Item -Path ($fileHash + '_fragments') -Destination "$storageDir/$hashPart"
+Get-ChildItem -Path ($fileHash + '_fragments/*') | Move-Item -Destination ("$storageDir/$hashPart/$fileHash" + '_fragments')
 Move-Item -Path ("$fileHash.mpd") -Destination "$storageDir/$hashPart"
 
 cd ..
diff --git a/Web/Presenters/OpenVKPresenter.php b/Web/Presenters/OpenVKPresenter.php
index 1505df92..0e5ac44e 100755
--- a/Web/Presenters/OpenVKPresenter.php
+++ b/Web/Presenters/OpenVKPresenter.php
@@ -198,6 +198,9 @@ abstract class OpenVKPresenter extends SimplePresenter
     {
         $user = Authenticator::i()->getUser();
 
+        if(!$this->template)
+            $this->template = new \stdClass;
+        
         $this->template->isXmas = intval(date('d')) >= 1 && date('m') == 12 || intval(date('d')) <= 15 && date('m') == 1 ? true : false;
         $this->template->isTimezoned = Session::i()->get("_timezoneOffset");