A few minor tweaks for GCC compat