Fixes for issue #145 and a small layout tweak

This _should_ fix #145, but I haven't tested it on the right platform (debian w/seccomp).  If someone is willing to test it, that'd be great!

Regardless, this appears to be testing fine on my normal setup!