Get gcc 4.8.2 building, fix a warning.