Various changes to get things building and working on my 64-bit Fedora 17 system