fix atomic<> related stuff