minor tweaks for gcc compat