Fixing compilation problems related to atomic