Fixing compilation problems