Fixed some compile errors (linked to #43)
Fixed some more compilation errors (as seen from i686 box)