Minor fixes to warnings under GCC 4.8