Gcc 4.8.2 compilation fixups

These two patches fix compilation with newer compilers, on newer versions of glibc, on x86_64.

I was building with gcc 4.8.2 on Fedora 20 against linux kernel `3.14.7-200.fc20.x86_64`.