Fixing current compilation problems