Trying to fix compilation problems