Build fix and autoconf sanitize.