Fix compile errors gcc 4.8/4.9