more gcc fixes