Fix a couple of bugs in atomicfree