Fixups for configure