diff --git a/HYthesisML.cls b/HYthesisML.cls
index da092ac803f7d65c4659e1efcbff3228214bf2b7..b1d011b1a5fb60e495bb01174ba6552f3c08dc57 100644
--- a/HYthesisML.cls
+++ b/HYthesisML.cls
@@ -137,6 +137,8 @@
 
 \LoadClass{report}[2000/05/19]
 
+\RequirePackage[T1]{fontenc}
+
 \RequirePackage{latexsym}[1998/08/17 v2.2e Standard LaTeX package (lasy symbols)]
 
 \if@latin
@@ -366,6 +368,7 @@
       {\translate{department2018}}
     \renewcommand{\oppiaine}{{Koulutusohjelma --- Utbildningsprogram  --- Study programme}}
     \renewcommand{\getSubject}{\programme}
+	\providecommand{\track}{}
 \fi
 \if@tktl
     \newcommand{\level}%
@@ -380,6 +383,7 @@
     % VM: poistin "oppiaineeseen laitos" lisäämällä allaolevan
     \renewcommand{\department}{\programme}
     \renewcommand{\getSubject}{\programme}
+	\providecommand{\track}{}
 \fi
 \if@cs
     \renewcommand\subject{\translate{\track}}
@@ -481,8 +485,8 @@
 %\renewcommand{\encltocname}{Liite}%
 }
 \addto\captionsswedish{%
-\renewcommand{\bibname}{Bibliografi}%
-\renewcommand{\refname}{Bibliografi}%
+\renewcommand{\bibname}{Referenser}%
+\renewcommand{\refname}{Referenser}%
 \renewcommand{\appendixname}{Bilaga}%
 \renewcommand{\appendixtocname}{Bilagor}%
 \renewcommand{\appendixpagename}{Bilagor}%
@@ -571,6 +575,21 @@
 
 \AtBeginDocument{
 
+   % Biblatex doesn't use bibname or refname. Instead it overwrites it with its own value.
+   % These values must be fixed manually, and done after biblatex has been loaded.
+   \@ifpackageloaded{biblatex}{
+       \DefineBibliographyStrings{finnish}{%
+          bibliography = {L\"ahteet}
+       }
+       \DefineBibliographyStrings{swedish}{%
+          editor       = {red.},
+          editors      = {red.},
+	      bibliography = {Referenser}
+       }
+   }
+
+
+
     \newcounter{selfdefined}
     \newcounter{numberofpages}
     \newcounter{numberofappendixes}
diff --git a/translator-UHCSthesis-coverpage-dictionary-Swedish.dict b/translator-UHCSthesis-coverpage-dictionary-Swedish.dict
index aed379bd6950e48b2ae2295b9d8bf6a852987978..bb0f22908ab628ffbae62f04b82a48929a6021bf 100644
--- a/translator-UHCSthesis-coverpage-dictionary-Swedish.dict
+++ b/translator-UHCSthesis-coverpage-dictionary-Swedish.dict
@@ -7,15 +7,15 @@
 \providetranslation{msc-level-2018}{Magisteravhandling}
 \providetranslation{msc-level-2017}{Magisteravhandling}
 \providetranslation{dsm-level}{Magisteravhandling}
-\providetranslation{sw-line}{Stidier i programvara}
+\providetranslation{sw-line}{Studier i programvara}
 \providetranslation{alko-line}{Studier i artificiell intelligens}
 \providetranslation{bio-line}{Studier i artificiellt bioinformatik}
-\providetranslation{nodes-line}{Studier i informationsn|"atverk}
+\providetranslation{nodes-line}{Studier i informationsn\"atverk}
 \providetranslation{dsm-level}{MSc thesis}
 \providetranslation{sw-line-2017}{Studier i programvara}
 \providetranslation{alko-line-2017}{Studier i algoritmer, data-analys ock maskinl\"arning}
 \providetranslation{bio-line-2017}{Studier i algorimiska bioinformatik}
-\providetranslation{nodes-line-2017}{Studier i distribuerade system ock datan\"t}
+\providetranslation{nodes-line-2017}{Studier i distribuerade system ock datan\"at}
 
 \providetranslation{sw-track-2018}{Studier i programvara}
 \providetranslation{alko-track-2018}{Studier i algoritmer}
@@ -26,7 +26,7 @@
 \providetranslation{networking-track-2020}{Studier i datan\"at}
 
 \providetranslation{tktl-programme}{Datavetenskap}
-\providetranslation{tkt-programme}{Kandidatprogramme i Datavetenskap}
+\providetranslation{tkt-programme}{Kandidatprogrammet i Datavetenskap}
 \providetranslation{csm-programme}{Datavetenskap}
 \providetranslation{cs-programme}{Magisterprogrammet i datavetenskap}
 \providetranslation{dsm-programme}{Master's Programme in Data Science}
@@ -34,14 +34,14 @@
 \providetranslation{department2018}{Avdelningen f\"r datavetenskap}
 \providetranslation{uh}{Helsingfors universitetet}
 \providetranslation{helsinki}{Helsingfors}
-\providetranslation{faculty}{Matematisknaturvetenskapliga fakulteten}
+\providetranslation{faculty}{Matematisk-naturvetenskapliga fakulteten}
 \providetranslation{address}{PB 68 (Pietari Kalm gata 5)\newline\indent 00014 Helsingfors universitetet, Finland}
-\providetranslation{eaddress}{Email addres:: info@cs.helsinki.fi\newline\indent URL: http://www.cs.helsinki.fi/}
+\providetranslation{eaddress}{E-postadress:: info@cs.helsinki.fi\newline\indent URL: http://www.cs.helsinki.fi/}
 \providetranslation{ytiedot}{Kontaktinformation}
 \providetranslation{library}{Helsingfors universitets bibliotek}
 \providetranslation{supervisors}{Handledare}
 \providetranslation{examiner}{Examinatorer}
 \providetranslation{appendices}{bilagor}
-\providetranslation{appendice pages}{bilagasidor}
+\providetranslation{appendice pages}{bilagesidor}
 \providetranslation{pp}{sidor}
 \providetranslation{seminar}{Seminar}