Fixes for easiler compiling under Linux.