minor tweaks for gcc