Fix compilation problems