FIX compilation problems