N2783

Collected issues with atomics