FIX compilation issues