fixes for gcc-4.7

...e with gcc-4.7 - fixes issue #7

(Compiled on Fedora 17 x86-64, need to verify that it still compiles on Ubuntu/Debian)