Fixing build and test on GCC.