Try to fix some builderrors with gcc 4.8.1