Modifications fixing build under GCC-4.7 on Linux.