diff --git a/VirtualFCS/Electrochemical/Hydrogen/FuelCellStack.mo b/VirtualFCS/Electrochemical/Hydrogen/FuelCellStack.mo
index cf75250..05896aa 100644
--- a/VirtualFCS/Electrochemical/Hydrogen/FuelCellStack.mo
+++ b/VirtualFCS/Electrochemical/Hydrogen/FuelCellStack.mo
@@ -6,7 +6,7 @@ model FuelCellStack
   outer Modelica.Fluid.System system "System properties";
   // Medium models
   replaceable package Cathode_Medium = Modelica.Media.Air.MoistAir;
-  replaceable package Anode_Medium = Modelica.Media.IdealGases.SingleGases.H2 constrainedby Modelica.Media.Interfaces.PartialSimpleIdealGasMedium;
+  replaceable package Anode_Medium = Modelica.Media.IdealGases.SingleGases.H2 constrainedby Modelica.Media.Interfaces.PartialPureSubstance;
   replaceable package Coolant_Medium = Modelica.Media.Water.ConstantPropertyLiquidWater constrainedby Modelica.Media.Interfaces.PartialMedium;
   //*** DECLARE PARAMETERS ***//
   // Physical parameters
diff --git a/VirtualFCS/SubSystems/FuelCellSubSystems.mo b/VirtualFCS/SubSystems/FuelCellSubSystems.mo
index 3d6501c..444018b 100644
--- a/VirtualFCS/SubSystems/FuelCellSubSystems.mo
+++ b/VirtualFCS/SubSystems/FuelCellSubSystems.mo
@@ -5,7 +5,7 @@ model FuelCellSubSystems
   outer Modelica.Fluid.System system "System properties";
   // Medium decleration
   replaceable package Cathode_Medium = Modelica.Media.Air.MoistAir;
-  replaceable package Anode_Medium = Modelica.Media.IdealGases.SingleGases.H2 constrainedby Modelica.Media.Interfaces.PartialSimpleIdealGasMedium;
+  replaceable package Anode_Medium = Modelica.Media.IdealGases.SingleGases.H2 constrainedby Modelica.Media.Interfaces.PartialPureSubstance;
   replaceable package Coolant_Medium = Modelica.Media.Water.ConstantPropertyLiquidWater constrainedby Modelica.Media.Interfaces.PartialMedium;
   // H2 Subsystem Paramters
   parameter Real m_FC_subsystems(unit = "kg") = subSystemHydrogen.m_system_H2 + subSystemAir.m_system_air + subSystemCooling.m_system_coolant + batterySystem.m_bat_pack;
diff --git a/VirtualFCS/SubSystems/Hydrogen/SubSystemHydrogen.mo b/VirtualFCS/SubSystems/Hydrogen/SubSystemHydrogen.mo
index 4defadb..2da8813 100644
--- a/VirtualFCS/SubSystems/Hydrogen/SubSystemHydrogen.mo
+++ b/VirtualFCS/SubSystems/Hydrogen/SubSystemHydrogen.mo
@@ -4,7 +4,7 @@ model SubSystemHydrogen
   // System
   outer Modelica.Fluid.System system "System properties";
   // Medium declaration
-  replaceable package Anode_Medium = Modelica.Media.IdealGases.SingleGases.H2(Temperature(start = system.T_start), AbsolutePressure(start = system.p_start)) constrainedby Modelica.Media.Interfaces.PartialSimpleIdealGasMedium;
+  replaceable package Anode_Medium = Modelica.Media.IdealGases.SingleGases.H2(Temperature(start = system.T_start), AbsolutePressure(start = system.p_start)) constrainedby Modelica.Media.Interfaces.PartialPureSubstance;
   // Parameter definition
   parameter Real m_system_H2(unit = "kg") = 61 "H2 system mass";
   parameter Real V_tank_H2(unit = "m3") = 0.13 "H2 tank volume";
diff --git a/VirtualFCS/Vehicles/DriveCycle.mo b/VirtualFCS/Vehicles/DriveCycle.mo
index f649668..e81aec8 100644
--- a/VirtualFCS/Vehicles/DriveCycle.mo
+++ b/VirtualFCS/Vehicles/DriveCycle.mo
@@ -17,9 +17,9 @@ model DriveCycle
     output String file;
   algorithm
     if v == VirtualFCS.Vehicles.DriveCycle.speed_profile.NEDC then
-      file := Modelica.Utilities.Files.loadResource("modelica://VirtualFCS.Resources.DataDriveCycles/NEDC.mat"); 
+      file := Modelica.Utilities.Files.loadResource("modelica://VirtualFCS/Resources/DataDriveCycles/NEDC.mat"); 
     elseif v == VirtualFCS.Vehicles.DriveCycle.speed_profile.WLTC then
-      file := Modelica.Utilities.Files.loadResource("modelica://VirtualFCS.Resources.DataDriveCycles/WLTC.mat");
+      file := Modelica.Utilities.Files.loadResource("modelica://VirtualFCS/Resources/DataDriveCycles/WLTC.mat");
     elseif v == VirtualFCS.Vehicles.DriveCycle.speed_profile.custom then
       file := path;
     end if;