Fixes/cleanups for autotools.