More attempts to fix atomics for older gcc