Fix for compilation problems