minor gcc cleanups