warning cleanup on gcc 4.8/4.9