Minor tweaks for GCC compilation.