tweaks for GCC