The first of these fixes a build failure on Debian Linux/armhf (and OS/X). If the patch seems ok, I'd like to roll it into a bug fix release. The second is more of a suggestion to make that atomicity test easier to debug, since it seems to find the dark corners of gdb.