Second try: Fix gcc4.8.1 builderros