diff --git a/src/pyfmi/fmi.pxd b/src/pyfmi/fmi.pxd
index 3df66bc5..776f0662 100644
--- a/src/pyfmi/fmi.pxd
+++ b/src/pyfmi/fmi.pxd
@@ -29,7 +29,7 @@ cimport numpy as N
 
 N.import_array()
 
-cimport fmil_import as FMIL
+cimport pyfmi.fmil_import as FMIL
 
 cdef FMIL.fmi_version_enu_t import_and_get_version(FMIL.fmi_import_context_t*, char*, char*, int)
 
diff --git a/src/pyfmi/fmi.pyx b/src/pyfmi/fmi.pyx
index f4de45d8..79ce1570 100644
--- a/src/pyfmi/fmi.pyx
+++ b/src/pyfmi/fmi.pyx
@@ -37,15 +37,11 @@ import numpy as N
 cimport numpy as N
 from numpy cimport PyArray_DATA
 
-N.import_array()
-
-cimport fmil_import as FMIL
+cimport pyfmi.fmil_import as FMIL
 
 from pyfmi.common.core import create_temp_dir, delete_temp_dir
 from pyfmi.common.core import create_temp_file, delete_temp_file
-#from pyfmi.common.core cimport BaseModel
 
-#from pyfmi.common import python3_flag, encode, decode
 from pyfmi.fmi_util import cpr_seed, enable_caching, python3_flag
 from pyfmi.fmi_util cimport encode, decode
 
diff --git a/src/pyfmi/fmi_coupled.pyx b/src/pyfmi/fmi_coupled.pyx
index c0bdf7e3..fd531d96 100644
--- a/src/pyfmi/fmi_coupled.pyx
+++ b/src/pyfmi/fmi_coupled.pyx
@@ -680,7 +680,7 @@ cdef class CoupledFMUModelBase(CoupledModelBase):
 
             The ValueReference for the variable passed as argument.
         """
-        cdef FMIL.fmi2_value_reference_t  vr
+        cdef FMIL.fmi2_value_reference_t vr
         
         name_parts = variable_name.split(".")
         try:
diff --git a/src/pyfmi/fmil_import.pxd b/src/pyfmi/fmil_import.pxd
index e91f8228..a31db80e 100644
--- a/src/pyfmi/fmil_import.pxd
+++ b/src/pyfmi/fmil_import.pxd
@@ -68,7 +68,7 @@ cdef extern from 'fmilib.h':
     ctypedef char   fmi2_byte_t
     ctypedef void * fmi2_FMU_state_t
     ctypedef void * fmi2_component_environment_t
-    ctypedef size_t fmi2_value_reference_t
+    ctypedef long unsigned int fmi2_value_reference_t
 
     #STRUCTS
     ctypedef enum jm_log_level_enu_t:
@@ -292,7 +292,7 @@ cdef extern from 'fmilib.h':
     ctypedef void(*fmi2_callback_logger_ft)(fmi2_component_environment_t c,fmi2_string_t instanceName, fmi2_status_t status, fmi2_string_t category,fmi2_string_t message,...)
     ctypedef void(*fmi1_step_finished_ft)(fmi1_component_t c, fmi1_status_t status)
     ctypedef void(*fmi2_step_finished_ft)(fmi2_component_environment_t env, fmi2_status_t status)
-    ctypedef void (*jm_logger_f)(jm_callbacks* c, jm_string module, jm_log_level_enu_t log_level, jm_string message)
+    ctypedef void (*jm_logger_f)(jm_callbacks* c, jm_string module, jm_log_level_enu_t log_level, jm_string message) except *
     ctypedef void *(*fmi2_callback_allocate_memory_ft)(size_t, size_t)
     ctypedef void(*fmi2_callback_free_memory_ft)(void *)
     ctypedef int(*fmi2_xml_element_start_handle_ft)(void *, char *, void *, char *, char * *)