Fixes to make GCC happier.