Changes for compatibility with gcc4.6 on the build server