more old gcc fixes (to be continued...)