Small fixes to make old GCC happy