gcc 4.8 warning cleanup