- fixed two problems compiling with gcc 4.0