The attached patch fixes a few build errors when compiling with GCC 4.3,