minor cleanups for linux/gcc