Tweaks for gcc